Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[16.0][FIX] mail_activity_done: patch _action_done in a more reliable way #1214

Conversation

StefanRijnhart
Copy link
Member

@StefanRijnhart StefanRijnhart commented Sep 4, 2023

Port of #1011 by @hbrunn. Depends on #1168.

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@houssine78
Copy link
Contributor

Hi @hbrunn I think it can be merged 👍

@hbrunn
Copy link
Member

hbrunn commented Sep 29, 2023

/ocabot merge

@houssine78 I prefer not to be pinged on stuff

@OCA-git-bot
Copy link
Contributor

Hi @hbrunn. Your command failed:

Required option bumpversion_mode for command merge. Possible values : major, minor, patch, nobump.

Ocabot commands

  • ocabot merge major|minor|patch|nobump
  • ocabot rebase
  • ocabot migration {MODULE_NAME}

More information

@hbrunn
Copy link
Member

hbrunn commented Sep 29, 2023

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 16.0-ocabot-merge-pr-1214-by-hbrunn-bump-minor, awaiting test results.

@OCA-git-bot
Copy link
Contributor

@hbrunn The merge process could not be finalized, because command git push origin 16.0-ocabot-merge-pr-1214-by-hbrunn-bump-minor:16.0 failed with output:

remote: Bypassed rule violations for refs/heads/16.0:        
remote: 
remote: - Changes must be made through a pull request.        
remote: 
To https://github.com/OCA/social
 ! [remote rejected]   16.0-ocabot-merge-pr-1214-by-hbrunn-bump-minor -> 16.0 (cannot lock ref 'refs/heads/16.0': is at 8d25f25e8d9bd79b4afcb5559d915c745e523598 but expected f66dbf174f3c12e365c597db1587a4caf1a37b7c)
error: failed to push some refs to 'https://***@github.com/OCA/social'

@OCA-git-bot OCA-git-bot merged commit 52c71ba into OCA:16.0 Sep 29, 2023
6 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 8d25f25. Thanks a lot for contributing to OCA. ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants